Merge branch 'rs/archive-zip-utf8'