Remove session mode
Merge branch 'master' into removeSessionMode
Remove sessionMode
Merge branch 'master' into removeSessionMode