Done in gh-1247