Merge pull request #15156 from eileenmcnaughton/dedupe5