update CPSOlver
Merge branch 'master' into feat-jg