This should be a separate pull request. It does not depend on the other stuff and shouldn't be blocked :)