Merge branch 'feature-solver' into develop
Merge branch 'develop' of github.com:chocoteam/choco3 into develop