Merge branch 'nd/sparse' (early part)