Jan, I'm closing this PR for now, since I'll have to check the code to understand how this is setup to work. I'll get to this soon. 
I would have left this PR open but since it's not mergeable in its current form and since the PR queue is growing, I felt it's better to close this one till we have come up with the right testcase.