Surfaced in #3558
Surfaced in #3558