[DGCEMD-385] DGCEMD-385