Merge branch 'refactor/notification_settings' into 'develop'