Merge pull request #17941 from eileenmcnaughton/fieldspec