This is an automated cherry-pick of pingcap#41036

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

Author: guo-shaoge