I've rebased the patch according to the CI bot's requirements. Please have a look.
pgsql-hackers by date:
Соглашаюсь с условиями обработки персональных данных