Upon Alexander reverting patches v15 from master, I've rebased what was correction patches v4 in a message above on a fresh master (together with patches v15). The resulting patch v16 is attached. Pavel.
pgsql-hackers by date:
Соглашаюсь с условиями обработки персональных данных