Merge pull request #19373 from eileenmcnaughton/valid