Merge branch 'binutils-llvm-ar-clang-macos' into release-3.21

Merge-request: !7039