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