OK, here's a version that does that in a combined patch, and adjusts the function comments to mention we also remap the stxkeys. Releases before 18 will need a little adjustment in the test files.
pgsql-bugs by date:
Соглашаюсь с условиями обработки персональных данных