Code

Merge branch 'jk/checkout-orphan-warning'