Merge 2.10.x

This merges 2.10.2-RC1 into 2.11.0-M3.

review by @paulp