merge develop-agent onto develop

Jonathan Ungrequested to merge
develop-agent-staging into develop

screw the template

Merge request reports