Merge branch 'develop' into refactor/notification_settings