Updating 2.6 branch head
Updating 2.6 branch head