Merge login-api into develop