Ilya Chernyshov <ichernyshovvv@gmail.com> writes:

> Ihor Radchenko <yantar92@posteo.net> writes:
>
>> It has been a while since the last update in this thread.
>> Ilya, do you need any help with the patch?
>
> Hi, here is the updated patch.

Thanks!

What about the attached amendment?
It should simplify things significantly.