Port changes to 1.7.10
Up version