Merge "Adjust CompOS case"