should fix a session bug
Merge branch 'develop' into staging