Hi Ihor,

Thanks for your comments. See attached the updated patch.