Merge pull request #10070 from eileenmcnaughton/dedup_3