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