Merge branch 'jn/unpack-trees-checkout-m-carry-deletion' into maint