Fixed MSM-234
Fixed MSM-634