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
3 jobs for !507 with feature/jorgen.lind/compile_fix_dms_2_1 into 2.1 in 63 minutes and 18 seconds (queued for 5 seconds)
merge train