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