@dgoodlad Let me know if this seems OK and I'll merge the upstream PR and then you can merge this one.