Merge pull request #22082 from eileenmcnaughton/validate