Fixed in other branch; won't fix it here as well, to avoid merge conflict.