Fixed MSM-892
Fixed MSM-292
I fixed something
Merge remote-tracking branch 'origin/development'