TODO in gh-3831