Merge branch 'jh/sparse-index-resize-fix' into maint