Sorry for the delay in getting back to you, this is the downside of forums that do not work with email.

As long as I understand the patch correctly, this seems exactly what is needed, at least initially. I'd go for submitting this and then we can review the result.

Thanks for picking this up.