Merge "Properly resolve the userId when running on concurrent multi-user" into main