PSA v2 of this patch - it has the same content, but an improved commit comment.
I have also added a commitfest entry, https://commitfest.postgresql.org/33/3109/
------Kind Regards,Peter SmithFujitsu Australia