Merge branch 'nd/fix-sparse-checkout'