Thank you, Amit. I have pushed this now to both branches.
Gracias, Daniel.
-- Álvaro Herrera https://www.2ndQuadrant.com/PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services