Hi all,
Here is an updated patch as per the review comments mentioned above.
Please review the updated patch.PFA.