Fixes for execution
Cleanup for test
Merge branch 'master' into cursorReworkingToAvoidNextTick