Fix 2.9 more backporting issues.