Merge "add zone_type definition to zoned properties"