Merge branch 'rv/send-email-cc-misc-by'