Merge 2.10.x into master

review by @paulp