FYI Already discussed here:
I started working on a PR but got stuck. I can have a second look this weekend, but am happy to pass over.