Merge branch feature/jorgen.lind/2.2.1 with refs/heads/2.2 into refs/merge-requests/548/train

3 jobs for !548 with feature/jorgen.lind/2.2.1 into 2.2 in 20 minutes and 55 seconds (queued for 1 second)
merge train