Updating 3.5 branch head
Updating 3.7 branch head