My understanding is that if this PR is merged then it will make @tonio's job much, more difficult. He'll either have tens of complicated conflicts to resolve, or he'll have to revert all the commits in this pull request. To me, it makes much, much more sense to wait for @tonio's PR.