Backport XCode12 build fix into release/4.4

Merged Quentin Arguillere requested to merge feature/xcode12_backport_4.4 into release/4.4

Backporting from !140 (merged)

Merge request reports