去掉临时文件
Merge remote-tracking branch 'origin/release-1.26'