Fixed MSM-721
Fixed MSM-741