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

3 jobs for !503 with feature/jorgen.lind/2.1.9 into 2.1 in 22 minutes and 3 seconds (queued for 5 seconds)
merge train