fixed bugs in sdk 1.5.8
Merge branch 'sdk-dev'