Merge "Add subsystem name field to Channel" into sc-dev