Mmm, related PR doesn't seem to be merged yet. @andrerom ?