Hi Andre,
Thomas, your part of the patch looks ok to me, too. I haven't tracked the discussion on whether it is ok to add your part of the patch. Therefore I don't have committed your patch. My opinion is, that it does do no harm. So it should be applied.
Based on the feedback so far, I will this apply during the weekend after another regression test unless somebody objects. Regards Thomas