Cherrypick #8521 into r2.6 (#8563)

Commit

330 days ago

Cherrypick #8521 into r2.6 (#8563) Co-authored-by: Chengji Yao <chengji.yao@bytedance.com>