[TV] - :yellow_heart: 2.5
Merge pull request #791 from michalbe/master

[TV] - 2.5