Sessions will stay for 24 hrs now
Merge remote-tracking branch 'origin/develop' into develop