Merge remote-tracking branch 'origin/master' into development
Fixed MSM-261
Merge remote-tracking branch 'origin/development'