Merge pull request #14794 from colemanw/select2map