Merge pull request #19336 from eileenmcnaughton/nfc