Fixed MSM-221
Fixed MSM-251
Merge remote-tracking branch 'origin/development'