Merge "Refactor ConsumerBase and it's derived classes." into mnc-dev