Merge pull request #17060 from eileenmcnaughton/dupefix