Hi,
>> Attaching separate patches one with edits, and the other for ERRORs.> Please review and let me know.>
I have registered this patch set in the CommitFest for tracking:https://commitfest.postgresql.org/patch/6694/
Regards,Ayush