Port to 1.7.10
Port to 1.7.10 #2