Merge 2.10.x (through 395e90a786) into master.

Also merges 2b4cd6c110 for SI-7302. This should smooth over the two bumps I contributed to the latest merge.