Merge pull request #19486 from eileenmcnaughton/pddemail