Merge "Introduce "input_id" column to the channels table" into lmp-dev