Fixes #26270