FORGE-848: Added @CommandScoped support
Merge pull request #323 from gastaldi/FORGE-848

FORGE-848: Added @CommandScoped support