Also updates to the latest versions while at it.
I will backport this after #32077 is merged.
Preview: