Andrey's extension makes sense to me, happy to make a combined patch.
If there are other places where this happens, we can either go one patch at a time or try to do it all together. I'm leaning towards one patch at a time. My only remaining question is if we need to backpatch this.
https://stream.boxwatch.ru/message-id/178447127453.110.12276981925360691905%40mail.gmail.com also adjusted vacuum_delay_point calls and was backpatched back to 14. That might not be necessary in our case, but I want to ask.
- Kevin Rocker