Backport multichannel updates from upstream
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2180669
Signed-off-by: Ronnie Sahlberg lsahlber@redhat.com
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2180669
Signed-off-by: Ronnie Sahlberg lsahlber@redhat.com