Merge branch 'rs/large-zip'