Issues with single dataset treated as multiple ones (for ROOT master)

Same as v5-34-00-patches.