Code

Merge branch 'mg/maint-send-email-lazy-editor' into maint