Merged 1.7.10 into master