Now handle all constraints in upgrade request to the internal solver (dose patch)
Reorder patches