Merge pull request #1861 from midopa/master

Clear the sessionOverride when cleaning up session