Merge branch 'zstd-armv6' into release-3.22

Merge-request: !6625