Provide a more robust discovery of existing agents (e.g. for boot
invokation)
Prevent potential resource leak