Merge "Change trace tag in Text" into devel/master