I'd like to use this issue to discuss any changes required before submitting a pull request to upstream.