[DGCEMD-469] DGCEMD-469