Merge branch feature/jorgen.lind/compile_fix_dms_2_1 with refs/heads/2.1 into...
Merge branch feature/jorgen.lind/compile_fix_dms_2_1 with refs/heads/2.1 into refs/merge-requests/507/train
Merge branch feature/jorgen.lind/compile_fix_dms_2_1 with refs/heads/2.1 into refs/merge-requests/507/train