Merge branch 'hotfix/login_errors' into develop
Merge branch 'develop'