(Reading the patch it seems both those points are already addressed)
pgsql-hackers by date:
Соглашаюсь с условиями обработки персональных данных