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