Merge "More consistent and clear traces.txt reporting."