do not corrupt session
Merge branch 'master' into portable