Update branch ready for the 2.9 branch