[DGCEMD-479] DGCEMD-479