Merge pull request #18126 from eileenmcnaughton/dupe529