Fixed MSM-662
Fixed MSM-661