[Bug 226508] Merge Review: tvtime