Merge 2.10.x into master

Review by @gkossakowski