Final head of the former 2.1 branch