backporting ecc patches