Merge branch 'feature/remove-settings-that-shouldnt-be-altered' into 'develop'