@btm, would we take this in the pull request?