Merge branch 'jc/checkout-orphan-warning'