merge franklin's code than commit it

Signed-off-by: spark.huang <240401736@qq.com>