I don't know what needs to be modified.
> I think the first step is to clearly identified the different kind > of changes by splitting your patch. > Then we will decide how to integrate them. > > > Ok.Will split the commit with no abi handling and continue from there
