was in inital version of 6ce9fb5f but got lost
during some rebasing/cherry-picking preceeding the pull request.