Merge branch 'jc/checkout-local-track-report'