Merge branch 'develop'
Fix detection of recess upon login
Merge branch 'develop'
Merge branch 'master' into production