3.8.2 原版代码导入

Signed-off-by: jacarrichan <772929989@qq.com>