branch-4.0: [fix](be) Pick #63969 and #63136#64116

BiteTheDDDDt wants to merge 3 commits into

apache:branch-4.0apache/doris:branch-4.0from

BiteTheDDDDt:codex/pick-63969-63136-branch-4.0BiteTheDDDDt/incubator-doris:codex/pick-63969-63136-branch-4.0Copy head branch name to clipboard