Merge branch 'main' into zstd-linus