Merge branch 'jc/maint-checkout-fix' into maint