Merge branch 'jc/maint-checkout-index-to-prefix' into maint