Merge branch 'nd/checkout-keep-sparse'