Merge pull request #22545 from eileenmcnaughton/build