this doesn't apply cleanly to head anymore, can you please post v21 ? I would love to test it here :)
pgsql-hackers by date:
Соглашаюсь с условиями обработки персональных данных