Merge "Fix product property type macros"