[TV] - :rocket: 2.5
Merge pull request #812 from michalbe/master

[TV] - 2.5