Merge pull request #20240 from eileenmcnaughton/actnfc