修正GlobalLock失败的问题
Merge remote-tracking branch 'origin/release-1.26'