Merge branch 'develop' into 'fix/notifsettings-breaking-login'