Port to 1.7.10