fix #10692
Merge branch '3.0.0'