Merge 2.5.18 into branch 2.5 tbds

[yongbingwang]

Why I'm doing:

What I'm doing:

Fixes #issue

What type of PR is this:

• [ ] BugFix
• [ ] Feature
• [ ] Enhancement
• [ ] Refactor
• [ ] UT
• [ ] Doc
• [ ] Tool

Does this PR entail a change in behavior?

• [ ] Yes, this PR will result in a change in behavior.
• [x] No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

• [ ] Interface/UI changes: syntax, type conversion, expression evaluation, display information
• [ ] Parameter changes: default values, similar parameters but with different default values
• [ ] Policy changes: use new policy to replace old one, functionality automatically enabled
• [ ] Feature removed
• [ ] Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

• [ ] I have added test cases for my bug fix or my new feature
• [ ] This pr needs user documentation (for new or modified features or behaviors)
  • [ ] I have added documentation for my new feature or new function
• [ ] This is a backport pr

Bugfix cherry-pick branch check:

• [ ] I have checked the version labels which the pr will be auto-backported to the target branch
  • [ ] 3.2
  • [ ] 3.1
  • [ ] 3.0
  • [ ] 2.5

[CLAassistant]

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
17 out of 18 committers have signed the CLA.

:white_check_mark: Youngwb
:white_check_mark: LiShuMing
:white_check_mark: trueeyu
:white_check_mark: zombee0
:white_check_mark: banmoy
:white_check_mark: amber-create
:white_check_mark: before-Sunrise
:white_check_mark: ZiheLiu
:white_check_mark: HangyuanLiu
:white_check_mark: stdpain
:white_check_mark: Astralidea
:white_check_mark: wyb
:white_check_mark: silverbullet233
:white_check_mark: sevev
:white_check_mark: packy92
:white_check_mark: evelynzhaojie
:white_check_mark: yongbingwang
:x: mergify[bot]
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

[mergify[bot]]

⚠️ The sha of the head commit of this PR conflicts with #39387. Mergify cannot evaluate rules on this PR. ⚠️