Update 3.2

Merged Morten Ofstad requested to merge feature/morten.ofstad/update_3_2 into 3.2

Merge request reports