Merge pull request #21565 from eileenmcnaughton/email