Merge "Add a tee sink filename suffix to distinguish type"