Draft: Fix/solver multitype

Timo Kochrequested to merge
fix/solver-multitype into master

Merge request reports