Thank you both for the review! After reviewing the issue again, I agree that my 0002 was wrong. 0001 received a trivial rebase as there were no conflicts, and I simply removed 0002 in favor of ChangAo Chen's thread.
pgsql-hackers by date:
Соглашаюсь с условиями обработки персональных данных