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