> In hopes of moving this effort along, I've posted a draft patch
> for that part here:
Thanks Tom, for your support and suggestions we are working on the addressing the review comments. I will integrate the patch with our changes and will update you.