Merge branch 'nd/sparse-co-fix' into next