[DGCEMD-324] DGCEMD-324