At least the diff still seems to be outdated. Maybe we just close this one and you create a new pull request?