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