Merge branch 'charon-cmd-agent'