Merge "Wait for groups to be created before getting uuids"