Merge pull request #522 from eric-wu/quickfix

Light refactoring for dynamo workers
Merge pull request #523 from eric-wu/quickfix

Merge down from release-1