Update 1.7.10 branch with 1.6.4 changes.