Why are these changes in this pull request? Can you rebase your changes on top of master?