Merge pull request #13179 from eileenmcnaughton/dedupe_rule