I'll let @mluessi address this. I guess it's easier for me to do merging/rebasing in the end but I don't know how it goes if the API has changed quite a lot.