Hi, Christoph,
I apologize that, despite your patch, nothing has happened so far.I have now attempted to read the code in question, but have to admit that I do not understand it sufficiently. Would it be possible for you to provide a small test case, that reproduces the problem?
Sorry, JochenP.S: I'd also appreciate, if you could make this within a Jira bug report. This goes far too long to be handled by email.