Merge branch 'master' into remove-make-solver-call