[DGCEMD-262] DGCEMD-262