Merge branch 'rj/sparse' into next