Merge "Use dedicated handlers in UserController"