Merge branch 'tb/idx-midx-race-fix'