Patch Set 6:

Somehow we missed to commit that change. Now there are many conflicting changes in master.

I tried to rebase but I had too many conflicts so I just would like to ask if I should go on with it or if you have other plans.