Please add these two patches to the upcoming commitfest,https://commitfest.postgresql.org/
-- Álvaro Herrera https://www.2ndQuadrant.com/PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services