CELDL-248 - email with attachments
Merge remote-tracking branch 'origin/master'