Correct behavior missed in merge.
Merge with parallel-executor