Merge pull request #20239 from eileenmcnaughton/act