Merge "Attach vendor_property_type to properties"