bug fixes on session
Merge branch 'dev' into base-build