Final head of the former 3.1 branch