Uncomment necessary code and fix stat counter queueing
Merge pull request #1814 from elzj/queue_changes

Uncomment necessary code and fix stat counter queueing