Merge branch 'pb/send-email-cccmd-fix'