I just added a new squashed pull request, will close this one.