Merge "Use separate lock in UserController"