Merge "Create shared timeline data structure and unit test cases"