Merge branch 'jn/cherry-pick-refresh-index' into maint