rebase one-to-many support

I simply cherry-picked your original onetomany support commit.
I tried my best to resolve the merge conflicts