Improved worker order.
Merge branch 'beta' into prod