This PR doesn't require new git version, and can be backported easily. Co-authored-by: 6543 <[email protected]>