[DGCEMD-478] DGCEMD-478