Merge branch '14297-partial-xcode-zero-check' into release-3.11

Merge-request: !1790