Fixed MSM-294
Fixed MSM-292