Picked a lot of solver improvements from develop
Merged crawler changes from develop branch
Merge branch 'rc/2.0.0' into develop