Merge "Move the type definition of properties from product to vendor" into sc-dev