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