Merge pull request #17814 from eileenmcnaughton/dedupe