Homec4science

rAKA/features%2Fsolver-rewrite
d846de9e46dfbugfixes/bug-fix-in…