Merge branch 'feature/jorgen.lind/update_2.3.4' into '2.3'

Feature/jorgen.lind/update 2.3.4

See merge request !597
3 jobs for !597 with feature/jorgen.lind/update_2.3.4 into 2.3 in 12 minutes and 58 seconds (queued for 140 minutes and 32 seconds)
latest