Add session scope
Merge pull request #6631 from adobe/dangoor/session-scope

Add session scope to 36 release