We should consider porting (at least part of) the fix for #28774 to 6.0.
We should consider porting (at least part of) the fix for #28774 to 6.0.