Draft: Revert "Merge branch 'streamline-channelid' into 'master'"
This reverts merge request !3134 (merged) . It's needed temporarily until Detector/master is made compatible with !3134 (merged)
This reverts merge request !3134 (merged) . It's needed temporarily until Detector/master is made compatible with !3134 (merged)