Merge 2.10.x into master.
No-op merge for [nomaster] part of 2.10.x