Port to 1.7.10

Please don't add library or API dependencies in pull requests