Merge branch 'feature/jorgen.lind/update_2.4.0' into '2.4'

update 2.4 branch with fixes in master branch

See merge request !634
9 jobs for !634 with feature/jorgen.lind/update_2.4.0 into 2.4 in 98 minutes and 29 seconds (queued for 2 minutes and 34 seconds)
latest