Merge pull request #22123 from eileenmcnaughton/act