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

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