Looks like you are right and vendorName was introduced in v6. If this isn't acceptable for master this patch might fit to the v6 branch.