Merge branch 'dm-fix-test-2' into dm