Merge CC 1.5 and 1.6 APIs