Merge pull request #8689 from eileenmcnaughton/dupe_pairs