Merge "Do not allow new additions to core_property_type"