Merge "Shared timeline plumbing"