Merge branch 'ParallelTermination'