[MDTM-814] MDTM-814 1