Fixed MSM-334
Fixed MSM-223
Merge remote-tracking branch 'origin/development'