Merge "trace identification refactoring (3)" into main