[Core] Merge some changes from TVDBv3 Branch