1.7.10 fixes backporting