When we retracted v0.35.x and went back to v0.34.x, we lost the context management that had been put in place over many months.

As #7768 was fixing some contexts in v0.36.x, the goal here is to try to bring whatever makes sense to main.