merged shoal-agent dev with master