Issues with single dataset treated as multiple ones

Use --rebase to avoid the merge commit.