[DGCEMD-616] DGCEMD-616