Merge branch 'hotfix/1.2.9.1'
Fix login
Merge branch 'hotfix/1.2.9.2' into develop