Merge remote-tracking branch 'erik/sendEmail' into core67-merge