> I'll work all the day on it, > > I'm pretty sure it can be solved without revert all the work. I am currently working on a rebase, just to find out what we really need. I will also send the result to the list.