branch-4.0: [cherry-pick](branch40) cherry-pick from master 59564 and 59473#59729

yiguolei merged 2 commits intoapache:branch-4.0apache/doris:branch-4.0from

zhangstar333:branch-4.0-0109zhangstar333/incubator-doris:branch-4.0-0109Copy head branch name to clipboard