OOIION-1789: Extensions to AgentControl