Merge branch 'jh/checkout-auto-tracking' into maint