Merge branch 'xcode-14' into release-3.22

Merge-request: !7350