KAA-141: Update default channel implementations to support better reusability