merging 792 and send email related changes

No match.