Merge "MODE_INFO size reduction"