Yes. Sorry for the mess. 

It is annoying to review patches like this. I'm offline at the moment but will fix it later.

It looks like the the rebase worked but I did a pull after that the resulted in a remerge of the older code.