Fixed: Replaced trakt with tvdb as data source
fixed cherry pick issues