Merge "Refactored DummyConsumer"