1.1 solver backport