Addendum to !109

t.knopffrequested to merge
fix_compilation_issues into develop

Contains missing commit from !109 (merged)

Merge request reports