Merge branch 'rs/archive-zip-many' into maint