Merge branch 'jn/cherry-pick-refresh-index' * jn/cherry-pick-refresh-index: cherry-pick/revert: transparently refresh index