Merge branch 'hotfix/hotfix'
Fix
Login fix
Cron fix
Merge branch 'hotfix/hotfix' into develop