Fixed MSM-342
Fixed MSM-142