Merge "Add more attribute when creating ProducerQueue"