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

Merge-request: !7204