Merge branch 'hotfix/hotfix'
URL redirect after login
Merge branch 'hotfix/hotfix' into develop