v11 patch do not apply due to recent code changes.Rebased. PFA v12.
Please feel free to check and discuss it.
-- Best regards,Pavel Borisov
Postgres Professional: http://postgrespro.com <http://www.postgrespro.com>