[DGCEMD-339] DGCEMD-339