Merge "Restructure tracing code to prepare for the adding of filtering and searching features." into sc-dev