Merge branch 'charon-cmd'