Merge branch 'fix-2764' of git.openi.org.cn