Sync with index-staging