Merge "Take new types out of compatible_property_only"