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