simple_consumer: sync with simple_local_consumer changes
simple_consumer: sync with simple_local_consumer changes

overdrive3000/skytools,markokr/skytools,markokr/skytools,tarvip/skytools,overdrive3000/skytools,overdrive3000/skytools,tarvip/skytools,tarvip/skytools,markokr/skytools