Merge branch 'ci-xcode-13.4' into release-3.22

Merge-request: !7520