P1 - EB-7309 changing session variable to request
Merge remote-tracking branch 'upstream/prodsupport' into prodsupport