[MDTM-818] MDTM-818