Merge branch 'develop' into feature-prefs

Just syncing these