Merge branch feature/jorgen.lind/update_2.0 with refs/heads/2.0 into refs/merge-requests/379/train

3 jobs for !379 with feature/jorgen.lind/update_2.0 into 2.0 in 28 minutes (queued for 2 seconds)
merge train