Merge branch 'jk/detect-truncated-zlib-input' into maint