am 261d3cda: Merge "Reconcile differences between zip implementations" into klp-dev

* commit '261d3cda32b28782d894be0244e617f78182ee3b':
  Reconcile differences between zip implementations