added agent that populates a client system context
Merge remote-tracking branch 'origin/develop'