KAA-141: Fix public API for ChannelManager