Sync with the CM tree after latest changes