Merge "Fix tee sink" into lmp-dev