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/494/train
3 jobs for !494 with feature/jorgen.lind/update_dms into master in 20 minutes and 34 seconds (queued for 7 seconds)
merge train