Done in gh-1247 / gh-1249