Merge branch 'sb/archive-zip-double-assignment-fix' into maint