Merge branch 'xcode-stdlib-flags' into release-3.14

Merge-request: !2919