Refactor mpool

Merged Michael Sammler requested to merge ci/refactor_mpool into master

Merge request reports