Now handle all constraints in upgrade request to the internal solver (do...

...se patch)