@mherchel: Thank you for the review.
Updated the patch as per your suggestion...