Final head of the 3.5 branch