Merge 2.10.x/2.10.2 into master.