Merge 2.10.x to master (again)

Merging eagerly to disable flaky tests.