Merge branch 'rj/sparse-updates' into maint