[DGCEMD-264] DGCEMD-264