DOCS-1492 command/group

Ready to merge!