Merge pull request #14975 from eileenmcnaughton/mapping_field