Fix compile error.
Merge remote-tracking branch 'origin/2.10.x' into 2.10.x