Refactor theTimelineItemIdentifier
handling
#3418
Merged
TimelineItemIdentifier
handling
#3418