Major commit to the constraint solver