Merge branch 'sdk_1.3-dev' into sdk_1.3
Merge branch 'sdk_1.3-dev' into sdk_1.3