Merge "Nit fix for multi-user test" into main