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

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