Feature/jorgen.lind/tools fixup

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

Merge request reports