Merge branch 'rj/sparse-flags'