Merge branch 'tp/send-email-from-config'