partial commit for sessions
Merge branch 'master2' into department