Backport COTR changes.