[CLC-922] Fixing timeshifting issues