Merge "UserController refactoring"