Merge branch 'jk/checkout-from-tree' into maint