No-op merge of 2.10.x into master