[DGCEMD-383] DGCEMD-383