Reintegration

Commits from integration branch without agent/worker communication refactoring and tests
It was serving as a reminder. It will be removed.