Merge branch 'notification-settings-docs-fix' into 'develop'