merge from branch dev-1.0.2

Signed-off-by: hancong03 <hancong03@baidu.com>