Merge branch 'hotfix/hotfix'
Sendmail fix
Query default fix
Merge branch 'hotfix/hotfix' into develop