Sure thing.  I don't think any of our other downstream changes really *need* anything from this PR, except perhaps the fixed public_ip handling, which I could easily split into a separate PR.