Merge branch 'hotfix/hotfix'
Git Pull fix
Sendmail logs fix
Tabs to spaces API
Merge branch 'hotfix/hotfix' into develop