## Proposed changes cherry-pick from master https://github.com/apache/doris/pull/40761 <!--Describe your changes.-->