Merged from the 4.1-dev branch for trq-1626 - not recognizing use_smt false.