Merge branch 'jk/maint-send-email-compose' into maint