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

3 jobs for !527 with feature/jorgen.lind/2.1_update into 2.1 in 24 minutes and 23 seconds (queued for 5 seconds)
merge train