Merge "Fix Early CCS bug"