Fixed duplicate tv cache issue.
Merge remote-tracking branch 'upstream/dev' into dev