Merge branch 'hotfix/sendmail'
Cron fix
Merge branch 'hotfix/hotfix' into develop