Fixed MSM-662
Fixed MSM-661
Merge remote-tracking branch 'origin/development'