Merge changes from topic "zipfile-cleanup" into main

* changes:
  Remove ZStreamRef class.
  Import files