Merge "TIF: Drop the requirement for ID tuple for non-broadcast channels" into nyc-dev