Merge pull request #21743 from eileenmcnaughton/regress