[dev] Trying to fix production mailer
Merge branch 'dev'