Merge "Reconcile differences between zip implementations" into klp-dev