[MXDLP-268] MXDLP-268