Hi Nicolas,

I'm still waiting for feedback from Karl Voit over in the other thread,
but here's the amended patch for you to review: