Merge pull request #9873 from eileenmcnaughton/dedupe_code