ref #1894 [upgraded consumer classes, deprecated consumer-channel class]