Merge pull request #13961 from eileenmcnaughton/validate