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

3 jobs for !525 with feature/jorgen.lind/2.1.11 into 2.1 in 22 minutes and 13 seconds (queued for 3 seconds)
merge train