Reintegration

Commits from integration branch without agent/worker communication refactoring and tests
If I understand correctly, the 1/second rate was slowing things down.
@intern-felicco