[cherry-pick](branch-2.1) Fix some group commit forward to master problems#38345
Merged
yiguolei merged 2 commits intoapache:branch-2.1from Jul 25, 2024
Merged
[cherry-pick](branch-2.1) Fix some group commit forward to master problems#38345yiguolei merged 2 commits intoapache:branch-2.1from
yiguolei merged 2 commits intoapache:branch-2.1from
