Merge branch 'je/send-email-no-subject' into next