Simon, what is the state on this? Do you plan to work on it in this pull request, or move it to an other ticket?