Merge "Reducing size of MODE_INFO struct"