Moving to 1 feed per task queue (from 12).
Merge branch 'master' into circular

* master:
  Moving to 1 feed per task queue (from 12).