Merge branch 'rs/zip-tests' into maint