Merge "Revert "Add IPTV default implementation"" into main