Final head of the former 2.5 branch