Bug#5689 Fix stream/timeline load
Merge pull request #138 from trungquan/Bug#5689

Bug#5689 Fix stream/timeline load