Changes made in session controller
Merge branch 'feature' into develop