[546270] Better tracing
32 files changed