update 2.4 branch with fixes in master branch

Merged Jørgen Lind requested to merge feature/jorgen.lind/update_2.4.0 into 2.4

Merge request reports