ScheduledExecutor instead of Timer for ConsumerEntity
Merge de la mort
Merge