Merge "UserController up"