Update to CC 4.0