Maybe an `@AwaitsFix` here instead of TODO? But I see that the test fails only with doc values and you are probably going to fix it right after pushig this PR.