Final update before creating the 3_13 branch.