Merge "Fix DataNodeBuilder for ChoiceNodes"