[MXSPS-687]