Merge "Correction to TRACE format strings"