So here's v21. I also attach a partial diff from v20, just in case anyone wants to give it a look.
pgsql-hackers by date:
Соглашаюсь с условиями обработки персональных данных