06746a162b
These packages are all highly interdependent and have to be updated in lockstep, so I'm just doing it all in one commit - there's no benefit to having cherry-pickable commits as they wouldn't work individually.