Merge pull request #2763 from Montellese/settings_definition_cleanup