[MDTM-819] MDTM-819