Merge pull request #20977 from JulieBar:remap_overflow