Merge branch 'ms/update-index-racy'