Merge branch 'ci-xcode-13.2' into release-3.21

Merge-request: !6897