Incremental Fixes for #1029: make sure there is no deadlock or OOM with outOfOrder set to true. Still much slower than false with unbounded executors