@Leo

Please find the revised patch-set.

Regards,
RG.