Merge pull request #10890 from eileenmcnaughton/dedupe