Merge branch 'hotfix.32.v1.0.1'
Fixed Bug 51
Merge branch 'Hotfix.51' into dev