Merge "Remove createZoneInfo() method"