Merge branch 'zstd-armv6' into release-3.20

Merge-request: !6625