branch-4.1: [fix](be) Pick #63417 and #63969#64117

BiteTheDDDDt wants to merge 3 commits into

apache:branch-4.1apache/doris:branch-4.1from

BiteTheDDDDt:codex/pick-63417-63969-branch-4.1BiteTheDDDDt/incubator-doris:codex/pick-63417-63969-branch-4.1Copy head branch name to clipboard