Fix build for Xcode 16.3

Merged Simon Morlat requested to merge fix/xcode-16.3 into release/5.4

Merge request reports