I made the patch to be in context format and I'll add this issue to CommitFest. Also, some code comments and style was changed to meet better readability.
pgsql-hackers by date:
Соглашаюсь с условиями обработки персональных данных