Merge branch 'jk/maint-checkout-orphan-check-fix' into maint