Hi Ihor,

Modifications made and split into two patches. Let me know if any
remaining issues.

Thanks
Matt