Thank you for useful suggestions. PFA patch, I have tried to cover all the points mentioned.
pgsql-hackers by date:
Соглашаюсь с условиями обработки персональных данных