Updating 3.4 branch head
Updating 2.8 branch head