rAKA/master-stable

features/solver-rewrite