Merge branch 'work/cmd' into devel