Merge branch 'fc/send-email-annotate'