Merge branch 'hlintala-5tv'