[CLC-922] Fixing timeshifting issues
Merge pull request #453 from yuhunglin/CLC-922

[CLC-922] Fixing timeshifting issues