Code

Merge branch 'jc/checkout-from-tree-keep-local-changes' into maint