Merge solver_redo back into master

[blowfishpro]

I think it's been long enough now that it shouldn't be considered a "feature" branch

Will wait for approval form @camlost2