Merge "TextOutput log improvement"