Merge "Replace tabs in rolling output" into main