Merge "Use the new vendor API format" into main