Merge pull request #14978 from eileenmcnaughton/map_field