1.1 solver backport

To be cleaned up and merged after #1424 (contains patch on top)
Supersedes #1388