Merge branch 'rs/zip-compresssed-size-with-export-subst' into next