[DGCEMD-377] DGCEMD-377