修改：仿照源码修改，提高性能
冲突
Merge remote-tracking branch 'origin/master'