Merge "Refactor trace configs." into main