Merge branch 'feature/jorgen.lind/update_3.0_2' into '3.0'

Feature/jorgen.lind/update 3.0 2

See merge request !680
10 jobs for !680 with feature/jorgen.lind/update_3.0_2 into 3.0 in 77 minutes and 32 seconds (queued for 8 seconds)