Merge "Refactor TRACE_INFO" into main