Feature/jorgen.lind/2.1.2

Merged Jørgen Lind requested to merge feature/jorgen.lind/2.1.2 into 2.1

Merge request reports