Thank you Michael, latest patch looks good to me. I have changed its status to ready for committer.
pgsql-hackers by date:
Соглашаюсь с условиями обработки персональных данных