Merge "Fix dx test 127-merge-stress"