Merge branch 'hotfix/hotfix'
Sendmail asynchronous
Merge branch 'hotfix/sendmail' into develop