Merge 2.10.x

review by @paulp, please