Merge "Fix to show trace output."