Hardy Ferentschik I have applied your pull request, I'll leave the issue opened as I imagine some changes have to happen on the CI.