Merge pull request #16989 from colemanw/seeingDouble