Fixed MSM-342
Fixed MSM-142
Fixed MSM-987
Fixed MSM-947
Fixed MSM-977
Fixed MSM-847
Fixed MSM-843
Fixed MSM-842
Finised MSM-302
Merge remote-tracking branch 'origin/development'