Merge branch feature/jorgen.lind/update_2.1 with refs/heads/2.1 into refs/merge-requests/501/train

3 jobs for !501 with feature/jorgen.lind/update_2.1 into 2.1 in 20 minutes and 6 seconds (queued for 1 second)
merge train