fix outside session
Merge branch 'master' into beta