Merge "Add zone for records autogeneration"