Two commit

Signed-off-by: WilliamChinese <linqingchinese@163.com>