BTW in the future if you have two separate patches, please post them in separate threads and use separate commitfest items for each, even if they have minor conflicts.
pgsql-hackers by date:
Соглашаюсь с условиями обработки персональных данных