Merge branch 'hotfix/session_context' into master-2