Merge pull request #15184 from eileenmcnaughton/dedupe9