Andrei Ivanov the best way to make progress here would be to create a PR containing a test case.

You can base it on the work we did for the initial issue you participated in.

Thanks.