Merge pull request #19421 from eileenmcnaughton/act2