Merge from 4.2.3 fix for trq-1626: setting use_smt to false is ignored.