Merge pull request #2531 from Montellese/settings_cleanup_4