Adjust queue variables
Merge branch 'master' into restructured

* master:
  Adjust queue variables