Attaching internal documents when sending email

T4522
Merge remote branch 'upstream/master'