Merge branch 'hotfix/v1.3.8-constellation'
Fix Mailer
Merge branch 'hotfix/v1.3.9-constellation' into develop