Fixes #35997 --------- Co-authored-by: Claude Sonnet 4.6 <[email protected]> Co-authored-by: wxiaoguang <[email protected]>