Hotfix/build issues

Merged Sylvain Berfini requested to merge hotfix/build_issues into release/4.3

Merge request reports