Merge pull request #14264 from colemanw/settingsOptions