added unset_zone_id context for clients