Merge branch 'sb/sparse-more'