Merge branch 'as/sparse-checkout-removal' into maint