Merge pull request #3584 from Montellese/settings_list_types