Added CC 1.6 changes