RE: Major commit to the constraint solver