Merge pull request #12669 from eileenmcnaughton/dedupe_zero