>
> Did you have any chance to look at this?
>

Yes, finally, and here is the patch.