Merge branch 'jc/zlib-wrap' into maint