25576 Email Template Updates
Merge remote-tracking branch 'origin/master'