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

3 jobs for !484 with feature/jorgen.lind/2.1.8 into 2.1 in 17 minutes and 16 seconds (queued for 4 seconds)
merge train