Merge branch feature/jorgen.lind/update_2.2 with refs/heads/2.2 into refs/merge-requests/538/train

3 jobs for !538 with feature/jorgen.lind/update_2.2 into 2.2 in 32 minutes and 26 seconds (queued for 3 seconds)
merge train