Co-authored-by: ti-srebot 66930949+ti-srebot@users.noreply.github.com

What problem does this PR solve?

Cherry-pick #1184 to branch 4.0

What is changed and how it works?

Check List

Tests

• Unit test
• Integration test
• Manual test (add detailed scripts or steps below)
• No code

Code changes

• Has exported function/method change
• Has exported variable/fields change
• Has interface methods change

Side effects

• Possible performance regression
• Increased code complexity
• Breaking backward compatibility

Related changes

• Need to cherry-pick to the release branch
• Need to update the documentation
• Need to be included in the release note