Merge "Finally fix TestModeBuilder so that it clones DND correctly" into main