Merge pull request #18305 from smowton/smowton/admin/agent-extracted-…

Merge pull request #18305 from smowton/smowton/admin/agent-extracted-… #8064