Thanks John. I've had almost the same patch running in my jd/zx2c4-deployment branch for quite some time now, and it works well, so merging this to master.