Merge branch 'ym/fix-opportunistic-index-update-race' into maint