Apologies, there was a merge failure and I failed to notice. Here's the correct patch. (This is also in github.com/alvherre/postgres/tree/merge-15)
pgsql-hackers by date:
Соглашаюсь с условиями обработки персональных данных