Timo, unfortunately the patch doesn't compile; I've moved the declaration of
"conn" one line up to make it work.

Oops, I guess I was too much in a hurry to even compile it. Here's a new patch that compiles and passes our director CI tests.