Feature/jorgen.lind/build fixes

Merged Jørgen Lind requested to merge feature/jorgen.lind/build_fixes into master

Merge request reports