Explicit protection option for queues
Merge branch 'shared_queues'