Final head of the former 3.6 branch