Merge "Refactor zip-related utility functions into a new utility class"