Merge "Add definition for zip64 struct"