Merge pull request #21745 from eileenmcnaughton/e_build