Merge pull request #14900 from eileenmcnaughton/regress