recover merged code

Signed-off-by: TomWu <phperwuhan@gmail.com>
a bit modify

Signed-off-by: TomWu <phperwuhan@gmail.com>
a bit modify

Signed-off-by: TomWu <phperwuhan@gmail.com>