I'm working on a pull request for this work. You can assign this issue to me if desired.