Merge pull request #1091 from smt/smt/tv44