merge huanxin code

Signed-off-by: yihao <yhchinabest@gmail.com>