Feature/jorgen.lind/bug fixes

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

Merge request reports