Merge pull request #9527 from neheb/zstd