Final head of the former 2.3 branch