Contribution to core-agent-linux repository