Merge "Check if tracing is on before generating strings" into tm-qpr-dev