CO/CR related changes.