Feature/jorgen.lind/update 3 2

Merged Jørgen Lind requested to merge feature/jorgen.lind/update_3_2 into 3.2

Merge request reports