[DGCEMD-476] DGCEMD-476