Merge pull request #22570 from colemanw/uniqueName