Merge "Fix tee sink build" into main