Merge branch 'test-xcode-13' into release-3.20

Merge-request: !6248