Fix CR bug & CDT completed