Port to CC 4.0