Due to similar fixed, we have also merged the patches discussed in the following thread.https://commitfest.postgresql.org/30/2736/The patch is posted on the 2736 side of the thread.
Regards.