Merge branch 'login' into dev