Merge branch feature/jorgen.lind/2.1.0 with refs/heads/2.1 into refs/merge-requests/411/train

3 jobs for !411 with feature/jorgen.lind/2.1.0 into 2.1 in 55 minutes and 45 seconds (queued for 2 seconds)
merge train