Merge pull request #15983 from eileenmcnaughton/search_nfc