Merge branch 'bc/send-email-use-port-as-separate-param'