Merge branch 'binutils-llvm-mt' into release-3.21

Merge-request: !7054