Merge pull request #16993 from eileenmcnaughton/emailget