1.7.10

Merge 1.7.10 into master branch