Daniel Gustafsson <daniel(at)yesql(dot)se> writes:
> I propose to apply the attached all the way down (with the basebackup hunk from
> 11), or down to 10 if we want to be conservative with the final 9.6 re ancient
> bugs that haven't seen complaints.
LGTM. No objection to applying this in 9.6.
regards, tom lane