修复trace:3572
Merge remote-tracking branch 'origin/dev-1.3.0' into dev-1.3.0