Added treadmill worker support.
Merge branch 'master' into staging