Revert removal of the MM channelID

Johannes Junggeburthrequested to merge
revert-16a9a72f into 22.0

This reverts merge request !53983 (merged). Tagging @pberta, @jmaurer, @sangelid

Merge request reports