Merge branch feature/jorgen.lind/update_dms with refs/heads/master into...

Merge branch feature/jorgen.lind/update_dms with refs/heads/master into refs/merge-requests/369/train
3 jobs for !369 with feature/jorgen.lind/update_dms into master in 41 minutes and 26 seconds (queued for 2 seconds)
merge train