I wrote: > This patch is against HEAD --- I've not looked at how much adjustment > it'll need for the back branches, but I'm sure there's some. I've back-patched this now. If you want to test the patch, the v10-branch version is at https://git.postgresql.org/gitweb/?p=postgresql.git;a=commitdiff;h=c3d113136bbaa86fbf1edde7aaf70ba06a6166b7 regards, tom lane