Merge branch 'hotfix/1.1.1'
Fix redirect to signup/done
Merge branch 'hotfix/1.1.2' into develop