Merge branch 'mm/checkout-auto-track-fix' into maint