Updating 3.6 branch head
Updating 3.6 branch head