backport session fix

Closed lazare requested to merge backport-fix-session into master

Merge request reports