改进测试
Merge branch 'dev-3.2.0' into dev-3.1.2