Hi Maciej!
Thanks for taking the time to look deeper into the issue. I now recall the discussion I had with Ronald. He was not satisfied with the first solution because we have been changing an Interface and was afraid of breaking backwards compatibility. That was the reason he introduced a new Interface in his version of the patch. So it seems we can go ahead and apply the patch.
Sebastian