Merge branch 'rr/send-email-ssl-verify'