[CMT][Task] CM server improvements