Stacked PRs are just the cost

The end of interest-based 3rd places is one of the biggest changes to hit GitHub in many years. The loss of 3rd places is one of the biggest changes to happen on GitHub in many years. So, it was hard to review 1000 lines in one PR. And we solve this by splitting into 2 PRs that still merge at the same time. </not asking in a mean way>.