Bugs in the hybrid parallelisation approach

Alessandro Bolisrequested to merge
fix/parallelbug into master

Merge request reports