Merge branch 'hotfix/session_context' into 'master'

fix missing session

See merge request !9