Merge "Fix a non-generic reference to DataContainerNode"