Merge pull request #16581 from eileenmcnaughton/nfc