Merge branch 'hb/maint-send-email-quote-recipients' into maint