Working login
Merge remote-tracking branch 'origin/v2-dev' into v2-dev