Merge "Broken EC after MODE_INFO size reduction"