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

3 jobs for !462 with feature/jorgen.lind/2.1.7 into 2.1 in 28 minutes and 39 seconds (queued for 7 seconds)
merge train