[MXDLP-164] MXDLP-164