This was causing some unit test failures because we would block till run, but since run was incremented before handleRun was called we had a race condition
Merge branch 'master' into concurrent_testability