## Proposed changes pick from master https://github.com/apache/doris/pull/37638 <!--Describe your changes.-->
bp #37043
bp #36750 and #36787