Add demo command group
Merge changes