am 1bdeb9d8: Merge "Refactor ConsumerBase and it\'s derived classes."

* commit '1bdeb9d84f4c63a0fb6be2517aebe5de88a3bb45':
  Refactor ConsumerBase and it's derived classes.