Fixed more issues with benchmark
Merge branch 'master' into cursorReworkingToAvoidNextTick