Merge branch 'rs/zip-with-uncompressed-size-in-the-header'