Merge pull request #5714 from colemanw/uiSelect