These changes are already in master. Pushing the same thing to develop.