Master bug#5189

I didn't put code for QueueCreate, because when I tested it, QueueCreate did not make problem. I can put it, but I do not know what I need to check in that case when Queue is created.