Merge 2.10.x

review by @jsuereth