Merge branch 'rj/sparse'