Hi Dariusz,
Thanks for the feedback.
Please check v4 of this patch including the requested changes.

Regards,
Khadem