修复光标
Merge remote-tracking branch 'origin/release-1.3.0' into release-1.3.0