Merge branch 'hlintala-tvc'