FORGE-848: Added @CommandScoped support
CommandScopedTest is failing