Merge branch 'jc/maint-checkout-keep-remove' into maint