Merge pull request #17980 from eileenmcnaughton/dupe