Merge branch 'xcode-pch' into release-3.22

Merge-request: !7166