Merge "Development: remove deployagent"