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
Merge branch feature/jorgen.lind/compile_fix_dms_master with refs/heads/master into refs/merge-requests/506/train