That will be addressed by #1321 which I'll merge as soon as it's green.