Merge branch feature/jorgen.lind/compile_fix_dms_master with refs/heads/master...

Merge branch feature/jorgen.lind/compile_fix_dms_master with refs/heads/master into refs/merge-requests/506/train
3 jobs for !506 with feature/jorgen.lind/compile_fix_dms_master into master in 52 minutes and 56 seconds (queued for 5 seconds)
merge train