Update send mail around issue
Merge remote-tracking branch 'origin/i0109'