Merge "Update tee sink"