Merge branch 'xcode-compiler-id-path' into release-3.18

Merge-request: !5506