Fixed MSM-434
Fixed MSM-433
Fixed MSM-439
Finished MSM-303