am 139ae547: Merge "Reconcile differences between zip implementations" into klp-dev

* commit '139ae5477f2df8aef40f0689371b055a438a72af':
  Reconcile differences between zip implementations