## Proposed changes Issue Number: close #xxx <!--Describe your changes.--> pick https://github.com/apache/doris/pull/36883 and https://github.com/apache/doris/pull/35239
## Proposed changes Issue Number: close #xxx <!--Describe your changes.--> pick https://github.com/apache/doris/pull/36883 and https://github.com/apache/doris/pull/35239