Merge pull request #14762 from eileenmcnaughton/mapping_whomp