Try to group updates, as in our other repos (#6971)

Hey, I'm tired of resolving conflicts across projects and solutions. Make a single PR for all the updates, like we do in other repos.