Unmanage queue and queue elements
Merge origin/master