[MXSPS-686]