Merge branch 'feature/jorgen.lind/2_3_5_final_commits' into '2.3'

Feature/jorgen.lind/2 3 5 final commits

See merge request !612
3 jobs for !612 with feature/jorgen.lind/2_3_5_final_commits into 2.3 in 15 minutes and 1 second (queued for 69 minutes and 13 seconds)