[DGCEMD-392] DGCEMD-392