Merge pull request #622 from john-hill/merge-worker

Merge worker
Merge branch 'release-10' into develop