Merge branch 'jp/maint-send-email-fold' into maint