Revert "Revert "1.7.10 fixes backporting""