Merge SAT solver branch