Merge branch 'rk/send-email-ssl-cert' into maint