Fixed MSM-323
Finished MSM-111
Fixed MSM-992
Fixed MSM-454
New testing change
Merge branch 'development'