Merge branch 'em/checkout-orphan'