Merge branch 'jc/checkout-auto-track'