Fixed MSM-341
Fixed MSM-299
Fixed MSM-294
Merge remote-tracking branch 'origin/development'