Merge branch 'jc/maint-fix-unpack-zlib-check' into maint