Include new 1.7.10 features