Merge branch 'master' into Adar
reports: fix tv and tv type
Merge branch 'Adar'