rAKA/features%2Fsolver-rewrite

bugfixes/ci_deploy_fixes